From 55bbe0612ea41dd263a59bee5134a9c3b0068fd3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sun, 5 Feb 2017 13:41:38 +0000
Subject: [PATCH] Rename generated gtktypefuncs.c to gtktypefuncs.inc

This is needed for the Meson port, a file name .c that's included
and shouldn't be compiled into an object is difficult to manage
otherwise. And it's not actually a valid .c file anyway.
---
 gtk/Makefile.am     | 6 +++---
 gtk/gtktestutils.c  | 2 +-
 gtk/makefile.msc.in | 6 +++---
 gtk/meson.build     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3d5745cf2b..ce84af9ace 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1093,7 +1093,7 @@ gtk_built_sources =				\
 	gtkresources.c				\
 	gtk.gresource.xml			\
 	gtktypebuiltins.c			\
-	gtktypefuncs.c				\
+	gtktypefuncs.inc				\
 	gtkmarshalers.c				\
 	gtkprivatetypebuiltins.c
 
@@ -1373,7 +1373,7 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
 	&& rm -f xgen-gptbc
 
 
-gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
+gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
 	$(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtk.h>') > xgen-gtfsrc.c && \
 	  echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
 	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
@@ -1381,7 +1381,7 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
 	  sort | uniq | \
 	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
 	&& cp xgen-gtf $@ && rm -f xgen-gtf
-gtktestutils.c: gtktypefuncs.c
+gtktestutils.c: gtktypefuncs.inc
 
 # target platform:
 lib_LTLIBRARIES = libgtk-4.la
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 8bba8b0d55..83d2a46aa5 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -181,7 +181,7 @@ gtk_test_register_all_types (void)
       GType *tp;
       all_registered_types = g_new0 (GType, max_gtk_types);
       tp = all_registered_types;
-#include <gtktypefuncs.c>
+#include <gtktypefuncs.inc>
       n_all_registered_types = tp - all_registered_types;
       g_assert (n_all_registered_types + 1 < max_gtk_types);
       *tp = 0;
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index a2b20359b8..01515e8cd0 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -58,7 +58,7 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe
 GENERATED = \
 	gtktypebuiltins.h gtktypebuiltins.c \
 	gtkmarshalers.h gtkmarshalers.c \
-	gtk.def gtktypefuncs.c
+	gtk.def gtktypefuncs.inc
 
 all :						\
 	..\config.h				\
@@ -576,8 +576,8 @@ gtkmarshalers.h : gtkmarshalers.list makefile.msc
 gtkmarshalers.c : gtkmarshalers.list makefile.msc
 	$(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >gtkmarshalers.c
 
-gtktypefuncs.c : makefile.msc
-	echo /*none*/ > gtktypefuncs.c
+gtktypefuncs.inc : makefile.msc
+	echo /*none*/ > gtktypefuncs.inc
 
 gtk-win32.res : gtk-win32.rc
 	rc -DBUILDNUMBER=0 -r -fo gtk-win32.res gtk-win32.rc
diff --git a/gtk/meson.build b/gtk/meson.build
index 7b1d0f1334..d18f406e5c 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -684,11 +684,11 @@ gtkprivatetypebuiltins_c = custom_target(
 )
 
 gentypefuncs_prog = find_program('gentypefuncs.py')
-# Generate gtktypefuncs.c
+# Generate gtktypefuncs.inc
 typefuncs = custom_target(
   'typefuncs',
   depends: gdkenum_h,
-  output : 'gtktypefuncs.c',
+  output : 'gtktypefuncs.inc',
   input  : gdk_headers + gtk_public_headers + gtk_deprecated_headers + gtk_private_headers + [gtktypebuiltins_h] + [gdkenum_h],
   command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
   install: false,
-- 
2.30.2